Debugged again