Fix for #772
More Fix for #772