serious bug fixed