this should resolve issue #1