Small fix from merging