Added more semantic check