code optimization
Another fix to define configuration