fix image upload bug
merge