fixed issue #6
fixed #6