updated to resolve issue #5