fixed config handling