Fixed bug, better config.