fixed #2434