Minor tweak to mixin