Fixing debug toolbar - 1747