Fixes #679

See #679