Fixes invalid indicator duplication