Issue 295

This should resolve issue #295.