Workaround for bug #6

A workaround for bug #6.

@c4mb0t, mind giving this a spin? Thank you.