Evil bug fixed caused by variable-name collision