Added another remaining issue