Config Change Bug Fix