Address dummy object issue. Close #30