[#2555] fix the @ bug