Fixed #1 (for real