Remove unnecessary assert
Fix box inclusion order