fix for #1090