Final Fix for #864