Fixed #52 and #53, which were fixed in 2.0.0.