fixed wrong comparison in last merge