Fixed bug and refixed required