Fixed variable hiding bugs

Version API 1.1.5