Quick fix for #485