Fix for #109