Fix issue 02.143 (intermediate)