Bug Fix :2344