Issue #393 - Fix config