Fix optional token building