Fix #44, probably