Final fix for the Doctrator driver