Fix  and add specs for it