fix a botched merge (2)