Correcting the namespace bug