BUGFIX: need to set visibility here as well