Possible solution for issue #6