Fix for #920, 885