shoot-yourself-foot bugfix