diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 94d0f3677..b3a44519c 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -5463,8 +5463,8 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
 							bx::StringView brace = bx::strFind(entry, "{");
 							if (!brace.isEmpty() )
 							{
-								const char* end = bx::strmb(brace.getPtr(), '{', '}');
-								if (NULL != end)
+								bx::StringView block = bx::strFindBlock(bx::StringView(brace.getPtr(), shader.getTerm() ), '{', '}');
+								if (!block.isEmpty() )
 								{
 									strins(const_cast<char*>(brace.getPtr()+1), "\n  float bgfx_FragDepth = 0.0;\n");
 								}
diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp
index c0f08b0fe..70332051b 100644
--- a/tools/shaderc/shaderc.cpp
+++ b/tools/shaderc/shaderc.cpp
@@ -1686,10 +1686,10 @@ namespace bgfx
 						bx::StringView brace = bx::strFind(bx::StringView(entry.getPtr(), shader.getTerm() ), "{");
 						if (!brace.isEmpty() )
 						{
-							const char* end = bx::strmb(brace.getPtr(), '{', '}');
-							if (NULL != end)
+							bx::StringView block = bx::strFindBlock(bx::StringView(brace.getPtr(), shader.getTerm() ), '{', '}');
+							if (!block.isEmpty() )
 							{
-								strInsert(const_cast<char*>(end), "__RETURN__;\n");
+								strInsert(const_cast<char*>(block.getTerm() ), "__RETURN__;\n");
 							}
 						}