Fixed white box bugs