solution for issue #91