Fixes for #74

See #74