Removed xx function
Fixed variable injection bug