nested hiccup fixes,