Fixed custom command failure, keeping NW for tests
After patch