Fix for #1320