timestamp issue fixed