removed duplicated property and change condition of !OS and !WIN32