Fwd: Quick solution to #118

Begin forwarded message: