Better fix for #36