#747 – spa fix everything