Fix error during last merge