Fix for blueprints