fixed @name -> @basename issue