fix for optimizer changes