Fixed #1 (the first issue, hopefully the last.)