Fix for multi translator support