Maybe some more local testing is in order