fixing code to work with Elixir master