Bugfixing after adding timestamps