Possible fix for failing tests against master