Really fix issue with Engine#call