Fixed the bug? I sure hope so...