Really fix issue & add tests