Fix for #106