Fix for #992