possible solution for issue #15