replace broken check so that #562