Fixed #1. Again