Initial Fix for #410