Fixed semantic errors!