Fixes #209, Fixes #168