Fix #1774 : installation issues