Cur Day/Hour Calculation fix