Fix for codeMotion2.