fix bug serengeti-1295