Ugly header fix

issue #990 fixed