Fix for #7