diff --git a/commands/gender.go b/commands/gender.go
index 238ddae..1861e87 100644
--- a/commands/gender.go
+++ b/commands/gender.go
@@ -2,7 +2,7 @@
 * @Author: Bartuccio Antoine
 * @Date:   2018-07-24 14:55:33
 * @Last Modified by:   klmp200
-* @Last Modified time: 2018-07-25 00:19:03
+* @Last Modified time: 2018-07-25 01:05:08
  */
 
 package commands
@@ -53,13 +53,11 @@ func Gender(m *tb.Message) {
 func cleanGender(slice []string) []string {
 	for i := range slice {
 		slice[i] = strings.Replace(slice[i], "\\", "", -1)
+		slice[i] = strings.Replace(slice[i], "@", "", -1)
 		clean := false
 		for !clean {
 			clean = true
-			if strings.HasPrefix(slice[i], "@") {
-				slice[i] = strings.Replace(slice[i], "@", "", 1)
-				clean = false
-			} else if strings.HasPrefix(slice[i], "/") {
+			if strings.HasPrefix(slice[i], "/") {
 				slice[i] = strings.Replace(slice[i], "/", "", 1)
 				clean = false
 			}