Don't tell anyone but I snuck in another distribution pipe fix.