Home fix

Fix for issue #233.