Fix not working, and refactor

:(