Fixed decleration bug