yet another fix to ./debug
Merge ../working