Fixing a bug in our config handling, AMEC-2209