Fixing removed function