Fixed #1 in previous commit.