Fix issue 496