Convertion problem fix