Tweak the findOneP function slightly