Fixed problem with empty properties