spam issue fixed