fixed #1515