Added a semantic issue workaround