fix bug serengeti-1287