Attempt to fix Firework issue.