Fixed the strict bugs pointed out by Good Muyis