Other bug fixed