Fixed fallback on create