Improve diagnostic