Fix for incompatible fetchAllKeyed