Fix issue 564