cel-d-12 #1598