improved fix for divide-by zero problem

Improving on the fix in !31646 (merged) which turned out tot trigger G4 Warnings in some older layout versions

FYI @tlari