Possible resolved wrong calculation of time