Possible solution for issue #42.