Fix issue with showing variables