bug fix for serengeti-965