Bug fixes (wrapper)