Fix #141

- following Igor's suggestion