Fixed time bugs