Fix issue 536.