Installation changed to add support for #1841