better handling of times ending in 0s