#77 fixed