Bugfix the time again, my logic is not so goods