Added bandaids suggested by @joshk.