This seems to fix the issue