#157 fixed. Thanks to RaveNoX.