v0.1.6 => Another bug fix