bugfixing timestamps