Better handling of # spin components