Fix for #21