Fixing timestamp problem