cel-d-08 #636