Fixed time insert issues