Performance fix: invisibles are removed correctly now