Temporary fix for the show/hide problem