Get rid of stupid bugs