Fix for issue #726

This is a fix for issue: #726