Fixing picker when using a non-default format