More bug correction