potential solution to issue #74