Fix state description duplication problem