fixed following bug