Added exists instead of find.isDefined test