Fixed bug in currrent time support