Fix assumptions