Ending fix