Fix issue 607