BUG FIX : maxWidth checks corrected