Fix #25, again