Fixed duplicate declarations