RSF-9 - Fix for date picker