fixes are done