Fixed and broke even more