fix for optimizer changes 2