Merge "fix image path"