179 fixed and tested