fixing with fixer, testing and working