Fixing the wrapper method again.