This is the fix for the hicckup
Yet another fix on hiccup branch
OK... fixed conflict, ready to merge