fix majd's shit