Fixes initial timestamps creation