Maybe this is the fix I'm looking for.