Fixing debug issue