Fixed config and listener