Bug Fix -  Issue #337