Bomber fixes