Fixed Issue #30

I hope.