Fix for new generate server