Quick fix on last version.  Still not tested with HTML