SPG fixes once again!