fix for not returning wrapper properly