Fix #7 for real this time