fixed duplicate issue