Added a more correct, convertion