Fix for #8