Removed some workaround on 'take'...