Finishing the fix for #10.