Fixed #4 for real this time