Fixing find_by