Fixes bug so UnitTest pass