fixed duplicate method