merged problem fixer to new dev surrogate plugin