Fixed generators issue with locals and params