Fixes FindAll