Fixed minor variable name collision bug