fix issue with variables