Updated to fix "bug" for incomplete property box.