Fix for #735

Fixes #735