Checks from 1.11 were added