Date selection issue fixed