Temporary workaround for PAW pseudos