fixed logic for variable checking in controllers
local commit
Pulling changes