Timestamp fix from Darren Whigham