fix bug serengeti-1339