Critical bug fixed!