Minor issue due to merge