This is my attempt to fix the problem