Attempt to fix Create (From / To)

Signed-off-by: Eric Poirier <eric@ericpoirier.ca>