Fix problems with conversion