#60 In tracing the issue, cleaned up the code to a better "find" statement