issue131 by EtherealMK