Critical bug fixed