Fix issue with Style Override mixin