BUG: return too early