Fix position of terms. Closes #2