Fixed problems with last merge on @find