Bug fix with number conversion