#922 roll back debug