Bug fix.
Propert unit testing.