Improved Elixir #8 even more