Clean up fix for #613