Fix for interpreter replacement
Changelog