diff --git a/Scripts/Classes/Entities/Player.gd b/Scripts/Classes/Entities/Player.gd
index 6f8bbea..1ef54d4 100644
--- a/Scripts/Classes/Entities/Player.gd
+++ b/Scripts/Classes/Entities/Player.gd
@@ -146,16 +146,16 @@ const ANIMATION_FALLBACKS := {
 	"Pipe": "Idle", 
 	"Walk": "Move", 
 	"Run": "Move", 
-	"PipeWalk": "Move", 
+	"PipeWalk": "Walk", 
 	"LookUp": "Idle", 
 	"Crouch": "Idle",
 	"CrouchFall": "Crouch", 
 	"CrouchJump": "Crouch", 
 	"CrouchBump": "Bump",
 	"CrouchMove": "Crouch", 
-	"IdleAttack": "Attack", 
+	"IdleAttack": "MoveAttack", 
 	"CrouchAttack": "IdleAttack", 
-	"MoveAttack": "IdleAttack", 
+	"MoveAttack": "Attack", 
 	"WalkAttack": "MoveAttack", 
 	"RunAttack": "MoveAttack", 
 	"SkidAttack": "MoveAttack",