I'm fixing a thing - closes #999