serious bug fixed!