Fixes #223
Fixes #223