(SERVER-4) Change check implementation