fixed, and working