Remove useless restriction on wrapper functions