Fixed Issue #23

That was easy...