FilePicker bug fix