cel-d-08 #787