Fixing a bug right before the weekend