Fix for ms timestamp issue