Convertion fix