Solution to issue #131