Fix for latest Elixir