Fix task #4372