Attempt to fix Yasir crashes