Cargo-cult bugfix?