fixed shadowing conflict