Fixed problem that was causing some tests to fail