Fixed re-declaration issue