better fix for #5 + fix image uploader error from last commit