Final Fix for #992