Fix for multi-lang system