Fix pickadate hack