Temporary fix for #997