Possible solution to issue #9.