Fixing a mixin bug copied over from another project