Fixed parsing statements