- Improve gdj scan (#927)