Yet further fixes number conversion