Fixed Madison's problems