Fixed Master Flow duplication