Less of ugly hacks