Introduced a bug with v1.0.1