Fix #246

do we need both of them to be checked?