Fixed double saving of statements