Cleaned up new installation bug fix