Quarintened the bug to lines 139-143