fix against issues 745