Proposed fix to re-entrancy problem when configuring