#7 reproduced
fixes and closes #7