Major performance bug fixed