Fix conversion happening always.