Better property check
2.0.1