Better fix for #53