cel-d-10 #588