Fix for #902