Improve previous fix

In some cases, floor is better than round.