Merge pull request #472 from MelanieT/spmanager_fix