Fix issue 1003 F31