Some magical fix provided by euwbah