Fix time left calculation