Merge "Fix unbound variable error"