Fix #16, Thanks @0x43