issue related to #609