Fix #605

See #605