Fix bug caused by left-over statement