Fix to Issue 321

Fix to #321