fix + additional coverage