Fix github issue #460