Fixed for new installation
Fixed new installation