Added special handling of linear flows.