Resolve name collision, fixing serious bug