Fixed #4 when I got the latest snapshot.