Fixed Issue #54-2