More bug fixed