Fixed #41
Fixes #42