cel-d-07 #595