Fix for #1218