diff --git a/PSKoans/Koans/Katas/Bugfixing.Koans.ps1 b/PSKoans/Koans/Katas/Bugfixing.Koans.ps1
new file mode 100644
index 000000000..cb3b1f6da
--- /dev/null
+++ b/PSKoans/Koans/Katas/Bugfixing.Koans.ps1
@@ -0,0 +1,130 @@
+using module PSKoans
+[Koan(Position = 152)]
+param()
+
+<#
+    Kata: Bug fixing
+
+    The bug fixing challenges below are based on some real world examples.
+#>
+Describe 'Debugging' {
+    Context 'The sticky one' {
+        BeforeAll {
+            function Debug-Me {
+                [CmdletBinding()]
+                param (
+                    [Parameter()]
+                    [string]
+                    $ObjectData
+                )
+
+                $ObjectData = [PSCustomObject]@{
+                    Name = $ObjectData
+                }
+
+                if ($ObjectData.Name -eq 'Value') {
+                    $true
+                }
+                else {
+                    $ObjectData
+                }
+            }
+        }
+
+        It 'should return true' {
+            Debug-Me -ObjectData 'Value' | Should -BeExactly $true
+        }
+    }
+
+    Context 'What about the iterator' {
+        BeforeAll {
+            function Debug-Me {
+                [CmdletBinding(DefaultParameterSetName = 'Default')]
+                param (
+                    [Parameter()]
+                    [string]
+                    $InputObject,
+
+                    [Parameter(ParameterSetName = 'Switch')]
+                    [switch]
+                    $Switch
+                )
+
+                switch ($InputObject) {
+                    default {
+                        'A value'
+                    }
+                }
+            }
+        }
+
+        It 'is supposed to return a value' {
+             { Debug-Me -InputObject 'Hello world' } | Should -Not -Throw
+        }
+    }
+
+    Context 'Pay attention to your surroundings' {
+        BeforeAll {
+            function Debug-Me {
+                [CmdletBinding()]
+                param (
+                    [Parameter(ValueFromPipeline)]
+                    [string]
+                    $InputObject
+                )
+
+                Write-Verbose 'Starting Debug-Me'
+
+                process
+                {
+                    Write-Verbose "Working on $InputObject"
+                }
+            }
+        }
+
+        It 'should not be returning anything' {
+            Debug-Me -InputObject 'a value' | Should -BeNullOrEmpty
+        }
+    }
+
+    Context 'But the blog said this would work' {
+        BeforeAll {
+            function Debug-Me {
+                $process = Get—Process -Id $PID
+                if ($process -and $process.Name -notin 'powershell', 'pwsh') {
+                    Write-Warning 'you must be using PowerShell'
+                    return
+                }
+            }
+        }
+
+        It 'should not be broken' {
+            { Debug-Me } | Should -Not -Throw
+        }
+    }
+
+    Context 'Something is leaking' {
+        BeforeAll {
+            function Debug-Me {
+
+            }
+        }
+    }
+
+    Context 'The little things matter' {
+        BeforeAll {
+            function Debug-Me {
+                $items = 1..10
+                foreach ($item in $items) {
+                    if ($items -eq 2) {
+                        Write-Output $items
+                    }
+                }
+            }
+        }
+
+        It 'should return odd numbers only' {
+            Debug-Me | Should -Be 2
+        }
+    }
+}