Make some correction - Thanks @lisasyarief