Bug #6 Fixed
Inprove