Minor fix (fix list out of range)
Adding empty stmts