severe bug fixed