Math.ceiling fix
Merge