Address issue #441