fixes #37, including variables