issue #17
fixed #17