#37: fixes this issue