Apply same fix to findOne