Fix issue 550