after bug fixed