Redeclare bug fixed