makaking fix n1
makaking fix n2