Fix for #145