Fix to Issue #253