Fix for multiple mixin wrappers