Fixed bug for 2.0 version with no token auth