Fix uglyness