Fix for #1123