Fix create

This PR needs to be merged after the one I made in AB