Hotfix/new properties first

Check new properties before deprecated ones. Thanks to @dereklwood for pointing out this issue.