Fix for #198

See #198