fixed #1312