Fixed number conversion and added test case..