Fix for timestamp