cel-d-08 #588