fixed issue #27