Can't we keep this assertion by doing same thing than for gallery ?