Remove not always working check