Fix #1173

will be merged once CIs give a green light.