Fix my fix for #1146