Fixing my brokeness