Fixed mixin for better handling.