Fixed boxes bug