Fixes #123. Closes #123