issue #1 seems fixed