Fix for #16