Fix #16, thanks to SubSide