Address issue #419