Fix Problem regarding to namespace