Fixed issue #138 (home view excluded)