Fix conversion/check