Need a fix from Blueprints 2.6