Fix for github issue #427