Fixed the bugs in statement