Better fix for #35