[#16] replace the @ with a ~ for now