Make it work with Erlang/OTP R16B01