Move check from code to select