fixed method duplication issue