Fix for #20