Fix for #1324