This seems to fix the issue even better