I have fixed it. Please review my new commit. Thanks.