*8094* Fixed pre-install behavior