Small fix to make all tests pass again