try and fix date selection