fix bug serengeti-1234