Fixes #1000 Timestamp issue