Solution to issue #131

Confirmed, sorry for the noise.