This has been identified as a problem and is being addressed in EEPC 6.2 release... Which is scheduled early next year.
Sorry for any trouble this has caused.
Hi Wayne, do you happen to have the bug number for this?
The team is working on a SIHF on top of 6.1 Patch 2 to address this issue, please make sure that every instance you are capturing is escalated to Tier III so that it can have a tracking BZ open.