Improved hidden handling