Possible solution to issue #14