Fixing get function