fix for #1515