Fwd: Solution to #118

Begin forwarded message: