Bug fix utility