Ensure variables are interpolated correctly

Fixes #11