Fixed Semantic Issue