Issue 8

- another attempt at fixing #8