fixing uglyness