Fixed statements bug