Fixing wrapper methods