Fix wrong variable names.
Merge branch 'bugfix' into 2014