Fix merge II

Found a little error