Another PR fix