Complete Fix for #410