Fixed the bug, finally.
Fixed the bug, finally.

dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-hippo