Removed overwriting of timestamps space