fix to address brackets issue 8395