fix namespace + flag work in progress