Stopgap measure, allow for longer names