Fix very mysterious bug