fixed issue #27
fixed issue #26