kind check improved