Issue 12 fix

Fix for #12.