bugfix on code interpolation