Better fix for #2