Fixed Check issues