bug fix for SERENGETI-955