Small fix for merging bug