Oh I just realised I did almost the same in PR #79 but worse. Will remove this bit from there.