Fix Sql Statements
Fix #3