implement proper fix fix