A prettier fix for #36