Changed semantic to stop errors