cel-d-12 #667