Fixed #15, but for real this time