cel-d-13 #588