Fixes #184

Please see #184 and #188