Fix issue #409