Issue594

issue #594