Fix bug with define variables