Fix for #6 is not complete

See the diff for this patch.