Fixed #1, this time I am sure