Fixing installer a bit more