FIX findex issue + add test