slight improvement to fixing timestamps