fixed fautly Default logic