Fixing issue working for Elixir >= 0.9.4