Fix for major bug within the find methods