Apply fix after code review, thx mat!