Fix #24 the reasonable way.