fix for null properties