Qick & dirty fix for #2836