Fix for #9