Better fix for stupid rounding issue