Fix #3310

Regression caused by 4b838af40d77684539dd40461bd92e6e453fe675
Quite possibly related to #3308