Fixed some issue in prev commit