Fix Resource creation