Fixed problem with time
Merged