More logic fixing for fragments