issu 594

issue #594