Image Picker bug fix