Fix for new Ecto behaviour