Hack create method so it works regardless