Bug Fix. Unit test.