first pass, #524, #667