fixed install issues, which came up after splitting the script up into libraries
Authored by: labi 2017-11-20
Parent: [r16]
Child: [r18]
