Testing out a potential middleware fix.