Fix to #1637
Created by: scarlehoff
(edit: first time I try to fully create a PR from the github-based vs code, seems to work well :) )
Created by: scarlehoff
(edit: first time I try to fully create a PR from the github-based vs code, seems to work well :) )