#162 change find to wait (not ideal)