This was causing some failures in the unit tests for some reason