Having a go at issue #777