Small modification and bug change