Issue #2151903 by johnv: Make sub_premise whole