Fix issue #427