Corrected fix for #578
Fixed problems with last merge on @find