Added width check