removed defers from wrapper