Hopefully fixing PSS