[#2] Temporary fix for modal and token fields [t: 2:00]