another try to fix token