Fix #7, fix double rounding issue