Multiple bug correction