fixed #1454