Fix for #6