Fixed critical error with installer

Will fast-forward master and develop immediately to
reflect these changes