Issue-273 -- get rid of duplicate method