FIX: Bug with variable refs again
0.7.1