Damage control from git issue