JWT fix