Fixed initial check