Fixed issue with time selector