trying to fix token positions, seems to work