Fix bug sometimes hiding things, and simplify