Fix for EntityQuery.withParameters bug