Width issue fix