Fixed an issue related to timestamps being
wrongly inserted into DB