Upstream way of fixing hidden