fixed issue #7 for real