Fixup - the mixin should now work as intended