squashing #25.