fix break bugs