Fixing semantic issue