Previous commit breaks unit test. Fixed