Fix issue 407