Story 182: Fix