Fixing visibility field