Update hiccup / safe-hiccup