Fix to allow name of up to 50 chars.