Fixed #1 for real this time