bug fix for SERENGETI-887