made fix from issue 2283 permanent because according MR was merged and macro is deleted