Adding proposed fix, worth a shot