Another stab at getting the curl right