Fix variables, fixes #7