critical bug fixed