fixed time issues