Trying to fix namespace bug