Improved fix on Timestamp issue.

I have improved the fixes introduced in c3e6b03b5abf7025d114f44856fdccf5f51bc990.