Fix rounding issues
Move from first to second