server side token type fixed.
removing workaround