fix hybrid evaluation replacement; closes #554