fixing inevitable breaks