Fixed #19

I implemented the fix for #19.