Temporary fix for #107