fixed duplicated methods