Apply fix from c7611d4 also to Tabular and Stacked