Fixing namespace issue