Bugfix: debug/sp was broken due to refactoring error