Fix handling milliseconds from timestamp