work against issue #2