Issue 737

Fixes #737