Added hack to bypass node access check