fixed issue #10 HOME bugs