Clean up issue with this variable