Fix for exploding trait