Fix for rename fail => panic