We fixed some potential bugs.