Fix overzealous optimization. Thanks to Duncan Sands for pointing out my error!