794 serious

See #799