Should fix fractional time in issue #18