first part to resolve issue #31