Features/issue 423

Address issue #423.