If you plan to make some radical alterations that could potentially "fix" that bug in near future, could you please freeze current state somewhere until diagnosis finishes?