Bug with empty properties has been fixed