Hacks for visibility