Fixed #59 - for real this time.