Re-enabled config
Fixed config bug