workaround for 5.21.7