One more Fix for #876