fixed issues in properties resolver