Fix issue 406