fixed bugs for combinations with flexbox