Fixes a mixed environment performance issue