Bug fix #31! Important! Major security leak!