update to Issue #53