Issue #49: Restoring what was Broken

2016