workaround for 681