fix timebug