bug fix for SERENGETI-1157