Dynamic engine call fix