ups, core also should return early. -v 0.9.9