Added fix from bug #2922