Temporary fix for #86